From: Jo-Philipp Wich <jo@mein.io>
Date: Sat, 4 Feb 2023 20:03:51 +0000 (+0100)
Subject: luci-base: form.js: fix GridSection modals in JSONMap instances
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=66fc1ad1f5c2464979e534b6c86055a1dc436881;p=project%2Fluci.git

luci-base: form.js: fix GridSection modals in JSONMap instances

Since grid section edit modals construct a new Map instance internally,
we must take care of using the correct map constructor type for the
internal copy in order to end up with the correct data provider.

Ensure that the extended option modal of GridSection instances uses a
JSONMap when the grid section's owner map is a JSONMap to avoid stray
uci related errors.

Ref: https://forum.openwrt.org/t/luci-save-apply/149658/5
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 6fe34990265a02dac20f7b352e4039a90fed45ca)
---

diff --git a/modules/luci-base/htdocs/luci-static/resources/form.js b/modules/luci-base/htdocs/luci-static/resources/form.js
index 3c538b88ca..5e31dc0dbe 100644
--- a/modules/luci-base/htdocs/luci-static/resources/form.js
+++ b/modules/luci-base/htdocs/luci-static/resources/form.js
@@ -3211,8 +3211,14 @@ var CBITableSection = CBITypedSection.extend(/** @lends LuCI.form.TableSection.p
 		return (stackedMap ? activeMap.save(null, true) : Promise.resolve()).then(L.bind(function() {
 			section_id = sref['.name'];
 
-			var m = new CBIMap(parent.config, null, null),
-			    s = m.section(CBINamedSection, section_id, this.sectiontype);
+			var m;
+
+			if (parent instanceof CBIJSONMap)
+				m = new CBIJSONMap(parent.data.data, null, null);
+			else
+				m = new CBIMap(parent.config, null, null);
+
+			var s = m.section(CBINamedSection, section_id, this.sectiontype);
 
 			m.parent = parent;
 			m.section = section_id;